index ea898a9,d2c7332..0000000
--- a/cloudinit/config/cc_set_hostname.py
+++ b/cloudinit/config/cc_set_hostname.py
@@@ -19,64 -18,13 +18,44 @@@ from cloudinit.config.schema import Met
  from cloudinit.distros import ALL_DISTROS
  from cloudinit.settings import PER_INSTANCE

++<<<<<<< HEAD
 +frequency = PER_INSTANCE
 +MODULE_DESCRIPTION = """\
 +This module handles setting the system hostname and fully qualified domain
 +name (FQDN). If ``preserve_hostname`` is set, then the hostname will not be
 +altered.
 +
 +A hostname and FQDN can be provided by specifying a full domain name under the
 +``FQDN`` key. Alternatively, a hostname can be specified using the ``hostname``
 +key, and the FQDN of the cloud will be used. If a FQDN specified with the
 +``hostname`` key, it will be handled properly, although it is better to use
 +the ``fqdn`` config key. If both ``fqdn`` and ``hostname`` are set,
 +the ``prefer_fqdn_over_hostname`` will force the use of FQDN in all distros
 +when true, and when false it will force the short hostname. Otherwise, the
 +hostname to use is distro-dependent.
 +
 +.. note::
 +    We strip a trailing . from the FQDN, if it is present. This causes problems
 +    with a lot of tools, if it is left in place.
 +
 +This module will run in the init-local stage before networking is configured
 +if the hostname is set by metadata or user data on the local system.
 +
 +This will occur on datasources like nocloud and ovf where metadata and user
 +data are available locally. This ensures that the desired hostname is applied
 +before any DHCP requests are performed on these platforms where dynamic DNS is
 +based on initial hostname.
 +"""
 +
++=======
++>>>>>>> upstreams/os-upgrade
  meta: MetaSchema = {
      "id": "cc_set_hostname",
-     "name": "Set Hostname",
-     "title": "Set hostname and FQDN",
-     "description": MODULE_DESCRIPTION,
      "distros": [ALL_DISTROS],
-     "frequency": frequency,
-     "examples": [
-         "preserve_hostname: true",
-         dedent(
-             """\
-             hostname: myhost
-             create_hostname_file: true
-             fqdn: myhost.example.com
-             prefer_fqdn_over_hostname: true
-             """
-         ),
-         dedent(
-             """\
-             # On a machine without an ``/etc/hostname`` file, don't create it
-             # In most clouds, this will result in a DHCP-configured hostname
-             # provided by the cloud
-             create_hostname_file: false
-             """
-         ),
-     ],
+     "frequency": PER_INSTANCE,
      "activate_by_schema_keys": [],
- }
+ }  # type: ignore

- __doc__ = get_meta_doc(meta)
  LOG = logging.getLogger(__name__)


diff --cc cloudinit/net/__init__.py
index 2141dc5,28ac814..0000000
--- a/cloudinit/net/__init__.py
+++ b/cloudinit/net/__init__.py
@@@ -564,13 -563,17 +563,27 @@@ def generate_fallback_config(config_dri
          # can't read any interfaces addresses (or there are none); give up
          return None

++<<<<<<< HEAD
 +    #
 +    # Always match on the name, rather than the MAC address. This way,
 +    # if the MAC address changes (which is possible VM environments),
 +    # the network configuration will still apply.
 +    #
 +    match = {"name": target_name}
 +
++=======
+     # netfail cannot use mac for matching, they have duplicate macs
+     if is_netfail_master(target_name):
+         match = {"name": target_name}
+     else:
+         match = {
+             "macaddress": read_sys_net_safe(target_name, "address").lower()
+         }
+     if config_driver:
+         driver = device_driver(target_name)
+         if driver:
+             match["driver"] = driver
++>>>>>>> upstreams/os-upgrade
      cfg = {
          "dhcp4": True,
          "dhcp6": True,
diff --cc systemd/cloud-init.service.tmpl
index 4223348,58031cc..0000000
--- a/systemd/cloud-init.service.tmpl
+++ b/systemd/cloud-init.service.tmpl
@@@ -25,6 -28,9 +26,12 @@@ After=wicked.servic
  After=dbus.service
  {% endif %}
  Before=network-online.target
++<<<<<<< HEAD
++=======
+ Before=sshd-keygen.service
+ Before=sshd.service
+ Before=systemd-user-sessions.service
++>>>>>>> upstreams/os-upgrade
  {% if variant in ["ubuntu", "unknown", "debian"] %}
  Before=sysinit.target
  Before=shutdown.target
diff --cc tests/unittests/sources/test_ec2.py
index d1cf544,abb010e..0000000
--- a/tests/unittests/sources/test_ec2.py
+++ b/tests/unittests/sources/test_ec2.py
@@@ -1177,7 -1430,7 +1430,11 @@@ class TestConvertEc2MetadataNetworkConf
              "version": 2,
              "ethernets": {
                  "eth9": {
++<<<<<<< HEAD
 +                    "match": {"name": "eth9"},
++=======
+                     "match": {"macaddress": self.MAC1},
++>>>>>>> upstreams/os-upgrade
                      "set-name": "eth9",
                      "dhcp4": True,
                      "dhcp6": False,
@@@ -1203,7 -1453,7 +1457,11 @@@
              "version": 2,
              "ethernets": {
                  "eth9": {
++<<<<<<< HEAD
 +                    "match": {"name": "eth9"},
++=======
+                     "match": {"macaddress": self.MAC1},
++>>>>>>> upstreams/os-upgrade
                      "set-name": "eth9",
                      "dhcp4": True,
                      "dhcp6": True,
@@@ -1229,7 -1476,7 +1484,11 @@@
              "version": 2,
              "ethernets": {
                  "eth9": {
++<<<<<<< HEAD
 +                    "match": {"name": "eth9"},
++=======
+                     "match": {"macaddress": self.MAC1},
++>>>>>>> upstreams/os-upgrade
                      "set-name": "eth9",
                      "dhcp4": True,
                      "dhcp6": False,
@@@ -1256,7 -1500,7 +1512,11 @@@
              "version": 2,
              "ethernets": {
                  "eth9": {
++<<<<<<< HEAD
 +                    "match": {"name": "eth9"},
++=======
+                     "match": {"macaddress": self.MAC1},
++>>>>>>> upstreams/os-upgrade
                      "set-name": "eth9",
                      "dhcp4": True,
                      "dhcp6": False,
@@@ -1283,7 -1524,7 +1540,11 @@@
              "version": 2,
              "ethernets": {
                  "eth9": {
++<<<<<<< HEAD
 +                    "match": {"name": "eth9"},
++=======
+                     "match": {"macaddress": self.MAC1},
++>>>>>>> upstreams/os-upgrade
                      "set-name": "eth9",
                      "dhcp4": True,
                      "dhcp6": True,
@@@ -1315,7 -1553,7 +1573,11 @@@
              "version": 2,
              "ethernets": {
                  "eth9": {
++<<<<<<< HEAD
 +                    "match": {"name": "eth9"},
++=======
+                     "match": {"macaddress": self.MAC1},
++>>>>>>> upstreams/os-upgrade
                      "set-name": "eth9",
                      "dhcp4": True,
                      "dhcp4-overrides": {"route-metric": 100},
@@@ -1494,7 -1726,7 +1750,11 @@@
              "version": 2,
              "ethernets": {
                  "eth9": {
++<<<<<<< HEAD
 +                    "match": {"name": "eth9"},
++=======
+                     "match": {"macaddress": self.MAC1},
++>>>>>>> upstreams/os-upgrade
                      "set-name": "eth9",
                      "dhcp4": True,
                      "dhcp6": True,
@@@ -1515,7 -1744,7 +1772,11 @@@
              "version": 2,
              "ethernets": {
                  "eth9": {
++<<<<<<< HEAD
 +                    "match": {"name": "eth9"},
++=======
+                     "match": {"macaddress": self.MAC1},
++>>>>>>> upstreams/os-upgrade
                      "set-name": "eth9",
                      "dhcp4": True,
                      "dhcp6": False,
diff --cc tests/unittests/test_net.py
index 3812bc4,68e44fa..0000000
--- a/tests/unittests/test_net.py
+++ b/tests/unittests/test_net.py
@@@ -4921,7 -1474,14 +1474,18 @@@ iface eth0 inet6 dhc
          with open(os.path.join(render_dir, "netrules")) as fh:
              contents = fh.read()
          print(contents)
++<<<<<<< HEAD
 +        self.assertEqual("", contents.lstrip())
++=======
+         expected_rule = [
+             'SUBSYSTEM=="net"',
+             'ACTION=="add"',
+             'DRIVERS=="hv_netvsc"',
+             'ATTR{address}=="00:11:22:33:44:55"',
+             'NAME="eth0"',
+         ]
+         assert ", ".join(expected_rule) + "\n" == contents.lstrip()
++>>>>>>> upstreams/os-upgrade

      @mock.patch("cloudinit.net.openvswitch_is_installed", return_value=False)
      @mock.patch("cloudinit.net.sys_dev_path")
@@@ -5006,7 -1566,14 +1570,18 @@@ iface eth1 inet6 dhc
          with open(os.path.join(render_dir, "netrules")) as fh:
              contents = fh.read()
          print(contents)
++<<<<<<< HEAD
 +        self.assertEqual("", contents.lstrip())
++=======
+         expected_rule = [
+             'SUBSYSTEM=="net"',
+             'ACTION=="add"',
+             'DRIVERS=="hv_netvsc"',
+             'ATTR{address}=="00:11:22:33:44:55"',
+             'NAME="eth1"',
+         ]
+         assert ", ".join(expected_rule) + "\n" == contents.lstrip()
++>>>>>>> upstreams/os-upgrade

      @mock.patch("cloudinit.util.get_cmdline")
      @mock.patch("cloudinit.util.udevadm_settle")
@@@ -5216,8 -1780,8 +1788,7 @@@ class TestRhelSysConfigRendering
  BOOTPROTO=dhcp
  DEVICE=eth1000
  DHCPV6C=yes
 -HWADDR=07-1c-c6-75-a4-be
  IPV6INIT=yes
- NM_CONTROLLED=no
  ONBOOT=yes
  TYPE=Ethernet
  USERCTL=no
@@@ -6142,87 -2642,13 +2649,12 @@@ class TestOpenSuseSysConfigRendering
  #
  BOOTPROTO=dhcp
  DHCLIENT6_MODE=managed
 -LLADDR=07-1c-c6-75-a4-be
  STARTMODE=auto
  """.lstrip()
-             self.assertEqual(expected_content, content)
-
-     # TODO(rjschwei): re-enable test once route writing is implemented
-     # for SUSE distros
-     #    def test_multiple_ipv4_default_gateways(self):
-     #        """ValueError is raised when duplicate ipv4 gateways exist."""
-     #        net_json = {
-     #            "services": [{"type": "dns", "address": "172.19.0.12"}],
-     #            "networks": [{
-     #                "network_id": "dacd568d-5be6-4786-91fe-750c374b78b4",
-     #                "type": "ipv4", "netmask": "255.255.252.0",
-     #                "link": "tap1a81968a-79",
-     #                "routes": [{
-     #                    "netmask": "0.0.0.0",
-     #                    "network": "0.0.0.0",
-     #                    "gateway": "172.19.3.254",
-     #                }, {
-     #                    "netmask": "0.0.0.0",  # A second default gateway
-     #                    "network": "0.0.0.0",
-     #                    "gateway": "172.20.3.254",
-     #                }],
-     #                "ip_address": "172.19.1.34", "id": "network0"
-     #            }],
-     #            "links": [
-     #                {
-     #                    "ethernet_mac_address": "fa:16:3e:ed:9a:59",
-     #                    "mtu": None, "type": "bridge", "id":
-     #                    "tap1a81968a-79",
-     #                    "vif_id": "1a81968a-797a-400f-8a80-567f997eb93f"
-     #                },
-     #            ],
-     #        }
-     #        macs = {'fa:16:3e:ed:9a:59': 'eth0'}
-     #        render_dir = self.tmp_dir()
-     #        network_cfg = openstack.convert_net_json(net_json, known_macs=macs)  # noqa: E501
-     #        ns = network_state.parse_net_config_data(network_cfg,
-     #                                                 skip_broken=False)
-     #        renderer = self._get_renderer()
-     #        with self.assertRaises(ValueError):
-     #            renderer.render_network_state(ns, target=render_dir)
-     #        self.assertEqual([], os.listdir(render_dir))
-     #
-     #    def test_multiple_ipv6_default_gateways(self):
-     #        """ValueError is raised when duplicate ipv6 gateways exist."""
-     #        net_json = {
-     #            "services": [{"type": "dns", "address": "172.19.0.12"}],
-     #            "networks": [{
-     #                "network_id": "public-ipv6",
-     #                "type": "ipv6", "netmask": "",
-     #                "link": "tap1a81968a-79",
-     #                "routes": [{
-     #                    "gateway": "2001:DB8::1",
-     #                    "netmask": "::",
-     #                    "network": "::"
-     #                }, {
-     #                    "gateway": "2001:DB9::1",
-     #                    "netmask": "::",
-     #                    "network": "::"
-     #                }],
-     #                "ip_address": "2001:DB8::10", "id": "network1"
-     #            }],
-     #            "links": [
-     #                {
-     #                    "ethernet_mac_address": "fa:16:3e:ed:9a:59",
-     #                    "mtu": None, "type": "bridge", "id":
-     #                    "tap1a81968a-79",
-     #                    "vif_id": "1a81968a-797a-400f-8a80-567f997eb93f"
-     #                },
-     #            ],
-     #        }
-     #        macs = {'fa:16:3e:ed:9a:59': 'eth0'}
-     #        render_dir = self.tmp_dir()
-     #        network_cfg = openstack.convert_net_json(net_json, known_macs=macs)  # noqa: E501
-     #        ns = network_state.parse_net_config_data(network_cfg,
-     #                                                 skip_broken=False)
-     #        renderer = self._get_renderer()
-     #        with self.assertRaises(ValueError):
-     #            renderer.render_network_state(ns, target=render_dir)
-     #        self.assertEqual([], os.listdir(render_dir))
+             assert expected_content == content
+
+     # TODO(rjschwei): re-add tests once route writing is implemented.
+     # See git history for removed commented tests

      def test_openstack_rendering_samples(self):
          for os_sample in OS_SAMPLES:
* Unmerged path .github/workflows/cla.yml